From f2705c2beee95e1b45d36165ccf884951acd0ca2 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 9 Jan 2009 04:19:08 +0000 Subject: [PATCH] Replace last-command-char with last-command-event. --- lisp/ChangeLog | 1 + lisp/textmodes/sgml-mode.el | 8 ++++---- lisp/textmodes/table.el | 4 ++-- lisp/textmodes/two-column.el | 6 +++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9569d30359f..08b9fa6a996 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -14,6 +14,7 @@ * progmodes/prolog.el, progmodes/sh-script.el, progmodes/simula.el: * progmodes/tcl.el, progmodes/vera-mode.el, progmodes/verilog-mode.el: * progmodes/vhdl-mode.el, progmodes/xscheme.el: + * textmodes/sgml-mode.el, textmodes/table.el, textmodes/two-column.el: Replace last-command-char with last-command-event. 2009-01-09 Dave Love diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index 9322f4fe61e..68a33e06896 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el @@ -595,16 +595,16 @@ Uses `sgml-char-names'." (defun sgml-name-self () "Insert a symbolic character name according to `sgml-char-names'." (interactive "*") - (sgml-name-char last-command-char)) + (sgml-name-char last-command-event)) (defun sgml-maybe-name-self () "Insert a symbolic character name according to `sgml-char-names'." (interactive "*") (if sgml-name-8bit-mode - (let ((mc last-command-char)) + (let ((mc last-command-event)) (if (< mc 256) (setq mc (unibyte-char-to-multibyte mc))) - (or mc (setq mc last-command-char)) + (or mc (setq mc last-command-event)) (sgml-name-char mc)) (self-insert-command 1))) @@ -714,7 +714,7 @@ With prefix argument, only self insert." (eq (aref tag 0) ?/)) (self-insert-command (prefix-numeric-value arg)) (sgml-attributes tag) - (setq last-command-char ?\s) + (setq last-command-event ?\s) (or (> (point) point) (self-insert-command 1))))) diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el index 45c8cb2999d..fbfdf573640 100644 --- a/lisp/textmodes/table.el +++ b/lisp/textmodes/table.el @@ -6,7 +6,7 @@ ;; Keywords: wp, convenience ;; Author: Takaaki Ota ;; Created: Sat Jul 08 2000 13:28:45 (PST) -;; Revised: Wed Jan 03 2007 13:23:46 (PST) +;; Revised: Thu Jan 08 2009 20:17:04 (PST) ;; This file is part of GNU Emacs. @@ -3943,7 +3943,7 @@ converts a table into plain text without frames. It is a companion to (defun *table--cell-self-insert-command () "Table cell version of `self-insert-command'." (interactive "*") - (let ((char (table--unibyte-char-to-multibyte last-command-char))) + (let ((char (table--unibyte-char-to-multibyte last-command-event))) (if (eq buffer-undo-list t) nil (if (not (eq last-command this-command)) (setq table-cell-self-insert-command-count 0) diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el index 0e95284b27d..8cbe801fc40 100644 --- a/lisp/textmodes/two-column.el +++ b/lisp/textmodes/two-column.el @@ -580,10 +580,10 @@ on, this also realigns the two buffers." ;; catch a mouse scroll on non-selected scrollbar (select-window (prog1 (selected-window) - (and (consp last-command-char) + (and (consp last-command-event) (not (eq (selected-window) - (car (car (cdr last-command-char))))) - (select-window (car (car (cdr last-command-char))))) + (car (car (cdr last-command-event))))) + (select-window (car (car (cdr last-command-event))))) ;; In some cases scrolling causes an error, but post-command-hook ;; shouldn't, and should always stay in the original window (condition-case () -- 2.30.2